(recursive_edit_1): Call cancel_hourglass unconditionally.

diff --git a/src/keyboard.c b/src/keyboard.c
index 109503afa52437480d4985618d87a5b488dcb5fc..c26d6a1296f0a7f3ba8202018c50f9b9542b7efb 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -928,8 +928,8 @@ recursive_edit_1 ()
 #ifdef HAVE_X_WINDOWS
   /* The command loop has started an hourglass timer, so we have to
      cancel it here, otherwise it will fire because the recursive edit
-     can take some time.  */
-  if (display_hourglass_p)
+     can take some time.  Do not check for display_hourglass_p here,
+     because it could already be nil.  */
     cancel_hourglass ();
 #endif